When deleting words, delete preceding whitespace as well. (#325358, Akkana

2006-01-02  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkentry.c (gtk_entry_delete_from_cursor): When deleting
	words, delete preceding whitespace as well.  (#325358,  Akkana Peck)

diff --git a/ChangeLog b/ChangeLog
index b3dee4edf2fbeb897b8ff38c4dea998ac024125d..3ff92137f68a6daf4140850238984f9d92c927b1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-01-02  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkentry.c (gtk_entry_delete_from_cursor): When deleting
+       words, delete preceding whitespace as well.  (#325358,  Akkana Peck)
+
 2006-01-02  Anders Carlsson  <andersca@imendio.com>
 
         * gdk/quartz/GdkQuartzWindow.c:

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index b3dee4edf2fbeb897b8ff38c4dea998ac024125d..3ff92137f68a6daf4140850238984f9d92c927b1 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2006-01-02  Matthias Clasen  <mclasen@redhat.com>
+
+       * gtk/gtkentry.c (gtk_entry_delete_from_cursor): When deleting
+       words, delete preceding whitespace as well.  (#325358,  Akkana Peck)
+
 2006-01-02  Anders Carlsson  <andersca@imendio.com>
 
         * gdk/quartz/GdkQuartzWindow.c:

diff --git a/gtk/gtkentry.c b/gtk/gtkentry.c
index a8fa84dd97472087d82c484bfd4051ede4190ef1..b1e8e94d92a0ace41ac60868659f0f40b30bc50e 100644 (file)
--- a/gtk/gtkentry.c
+++ b/gtk/gtkentry.c
@@ -2574,26 +2574,26 @@ gtk_entry_delete_from_cursor (GtkEntry       *entry,
       if (count < 0)
        {
          /* Move to end of current word, or if not on a word, end of previous word */
-         end_pos = gtk_entry_move_backward_word (entry, end_pos, TRUE);
-         end_pos = gtk_entry_move_forward_word (entry, end_pos, TRUE);
+         end_pos = gtk_entry_move_backward_word (entry, end_pos, FALSE);
+         end_pos = gtk_entry_move_forward_word (entry, end_pos, FALSE);
        }
       else if (count > 0)
        {
          /* Move to beginning of current word, or if not on a word, begining of next word */
-         start_pos = gtk_entry_move_forward_word (entry, start_pos, TRUE);
-         start_pos = gtk_entry_move_backward_word (entry, start_pos, TRUE);
+         start_pos = gtk_entry_move_forward_word (entry, start_pos, FALSE);
+         start_pos = gtk_entry_move_backward_word (entry, start_pos, FALSE);
        }
        
       /* Fall through */
     case GTK_DELETE_WORD_ENDS:
       while (count < 0)
        {
-         start_pos = gtk_entry_move_backward_word (entry, start_pos, TRUE);
+         start_pos = gtk_entry_move_backward_word (entry, start_pos, FALSE);
          count++;
        }
       while (count > 0)
        {
-         end_pos = gtk_entry_move_forward_word (entry, end_pos, TRUE);
+         end_pos = gtk_entry_move_forward_word (entry, end_pos, FALSE);
          count--;
        }
       gtk_editable_delete_text (editable, start_pos, end_pos);